From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Mon, 9 Dec 2024 10:44:05 +0000 (+0100)
Subject: improve definition of MIRALL_VERSION_SUFFIX and MIRALL_VERSION_BUILD
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~30^2^2~195^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6310e3e645386646b3613ecde4285875c1ff56d8;p=nextcloud-desktop.git

improve definition of MIRALL_VERSION_SUFFIX and MIRALL_VERSION_BUILD

should allow ompiling with MIRALL_VERSION_SUFFIX be empty

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---

diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index 51a42f4ce..7e717bf05 100644
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -214,7 +214,7 @@ QString Theme::version() const
 
 QString Theme::versionSuffix() const
 {
-    return QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION_SUFFIX));
+    return QString::fromLatin1(MIRALL_VERSION_SUFFIX);
 }
 
 QString Theme::configFileName() const
diff --git a/version.h.in b/version.h.in
index b8d97bb78..ba53a6545 100644
--- a/version.h.in
+++ b/version.h.in
@@ -25,17 +25,16 @@
 #define MIRALL_TOSTRING(s) #s
 
 /* MIRALL version */
-#define MIRALL_VERSION_MAJOR @MIRALL_VERSION_MAJOR@
-#define MIRALL_VERSION_MINOR @MIRALL_VERSION_MINOR@
-#define MIRALL_VERSION_PATCH @MIRALL_VERSION_PATCH@
-#define MIRALL_VERSION_BUILD @MIRALL_VERSION_BUILD@
+constexpr int MIRALL_VERSION_MAJOR = @MIRALL_VERSION_MAJOR@;
+constexpr int MIRALL_VERSION_MINOR = @MIRALL_VERSION_MINOR@;
+constexpr int MIRALL_VERSION_PATCH = @MIRALL_VERSION_PATCH@;
+constexpr int MIRALL_VERSION_BUILD = @MIRALL_VERSION_BUILD@;
+constexpr auto MIRALL_VERSION_SUFFIX = "@MIRALL_VERSION_SUFFIX@";
 
-#define MIRALL_VERSION_SUFFIX @MIRALL_VERSION_SUFFIX@
+#cmakedefine MIRALL_VERSION       @MIRALL_VERSION@
+#cmakedefine MIRALL_VERSION_FULL  @MIRALL_VERSION_FULL@
 
-#define MIRALL_VERSION       @MIRALL_VERSION@
-#define MIRALL_VERSION_FULL  @MIRALL_VERSION_FULL@
-
-#define MIRALL_VERSION_STRING "@MIRALL_VERSION_STRING@"
+#cmakedefine MIRALL_VERSION_STRING "@MIRALL_VERSION_STRING@"
 
 constexpr int NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_MAJOR = @NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_MAJOR@;
 constexpr int NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_MINOR = @NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_MINOR@;